Started structuring the code. Added some controllers