fixed some bugs and added websocket server
updates to file locations and requires
moved files