Clean Up

Clean the code and add comments
Reorganize classes and fix the layout
Fix Title