Simplification

Greatly simplified the module structure. Will probably rename this
project something else in the near future.