Moved some stuff around
Merge pull request #8 from AquilaSagitta/development

Moved some stuff around