Renamed files for better structure