Some minor restructuring, with addition of a dev server script.