Refactoring

* Merged public and private profile JSPs
* Renamed servlet classes as *Servlet.java for consistency