rearenged files

improved file sorting