Cleanup and Organization
Structure placement will no longer lock the server. Closes #5