Reorginsation and documentation added.

This reorganisation prepares the pack for future features and makes it more closely resemble its predecessor.