move common files out of subdir
fix refs
separate conf files for enviroments
Merge pull request #8 from fullaf/refactor_dirs

Refactor dirs