Restructured Code

So Antonio and I restructured the code so that it would be useable with
storyboard. I want to continue to clean up the code but for now it is
working with storyboard and is cleaner than before. Also as far as I can
tell no bugs!