Moved classes and JSPs to their places

  * Fixed some minor presentation issues