Reorganize files
Create test for socket io