debug, trying to remove module
Starting from scratch with better directory structure