Cleaned up files to correct directories