FE: Re-adding some files and reverting file paths.