Thourough reorganization of theme files.