Refactored into separate files
Version bump