Dividing more stuff
Removed some comments
More separation
Restructure the files