Fixing some naming, moving files to the right place.