Fixing TS references
Reorganizing
Removing rogue debugger statement
Fixing server.js path reference