Adjusted some organization.
Merge branch 'master' of https://github.com/Zpiritual/fluxx