General Cleanup

Hey Erika

I cleaned the code up a bit. Using yaml routing.yml, controllers and more general stuff :)