Renamed files for appropriate naming structure