Added server and test stubs, cleaned up package