diff --git a/lib/jekyll-compose/arg_parser.rb b/lib/jekyll-compose/arg_parser.rb
index 6e0b3e2..9a65c89 100644
--- a/lib/jekyll-compose/arg_parser.rb
+++ b/lib/jekyll-compose/arg_parser.rb
@@ -31,7 +31,8 @@ def force?
       end
 
       def source
-        config["source"].gsub(%r!^#{Regexp.quote(Dir.pwd)}!, "")
+        File.join(config["source"], config["collections_dir"])
+          .gsub(%r!^#{Regexp.quote(Dir.pwd)}/*!, "")
       end
     end
   end
diff --git a/lib/jekyll-compose/file_creator.rb b/lib/jekyll-compose/file_creator.rb
index 6e2ed8f..28ecbeb 100644
--- a/lib/jekyll-compose/file_creator.rb
+++ b/lib/jekyll-compose/file_creator.rb
@@ -29,7 +29,7 @@ def validate_should_write!
 
       def ensure_directory_exists
         dir = File.dirname file_path
-        Dir.mkdir(dir) unless Dir.exist?(dir)
+        FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       end
 
       def write_file