Add a Mac type
Move routes to new modules
Add a couple of packages, use Controllers