Merge pull request #115 from dizzzz/develop

Finalizing restructuring