Added some more plan controller specs and reorganized to match module structure.