Day 1 - 2 hrs

- Re-organized namespaces
- Added a static keyboard manager