Moved files in server into modules