Change property naming strategy, reorganize things a bit, bump version to 2-SNAPSHOT