prepare for dub
resolve conflicts
rearange folder for dub
update gitignore
properly import/module syntax
aplications return to old place
dub is ready