New file structure, need works still on networking bugs