Refactoring: Switch to Maven, repo cleanup & minor bugfixes