Some simple refactoring + move to version numbers instead of timestamps