Merge pull request #4 from murrekatt/develop

Structure cleanup and base library for both programs