Commit Two

Fixed all the moving of the files that we had trouble with.

* Removed onMenuClicked funciton that was refrenced but not implemented.