Revert "Major refactoring update"

This reverts commit 90eb15692152f8524fd144346c295babe3498f64.
evert "Major refactoring update, split project into server, client, test"

This reverts commit 3158df77a17154712f8b4e7d9478b0810efde946.