Completed marv server create rewrite
Reorganize modules into folders