Restructures for server side seperation