Restored original jsps and other files, code cleanup, added UserService