changed/sorted file structure