Controller Modulization

yay
Too much stuff to undo

keep the names of the files the way they are .-.