Server added and project rearranged for deploy