Added project folder, fixed file names