Switched version to 0.9.0-SNAPSHOT, some more structural refactorings.