Major updates to folder structure. Server/client work done.