refactor directory structure

Improved debugging output