Final changes made to make it run correctly and put files in the right place