Moved files around and got main client-handling loop working