Renamed files and redid directory structure.