combining into single file and moving templates out of public folder for security
removing -> macro usage
cleaning up refered ns and changing server ns to core to mimic simple project structure