cleaned up, renamed some files, improved rest conformity