Flattening project structure.

Implementing only the functionality that is currently needed rather
than planning for a potential addition which may not eventuate.