Moved JSP files to the proper folder, fix encoding issue in resources