Reorganised selectors and file naming
Renamed files
Header code