re-structured directories
Merge branch 'master' of git://github.com/big-eye/utils

Conflicts:
	composer.json