Merge pull request #8 from Breeze/development/zza

Development/zza cosmetics and file shuffling