Reorganising
Delete unused files
Lots of cleanup