Moving files to the correct filesystem path
Moving files to the correct filesystem path
Adding some tests