Clean-up
Fix buildpath
Rename
Minor
Refactor
Readying up for making the menu list