Add websockets and reorganize files