Refactored ch.spacebase to org.spacehq, reformatted code and line endings