Changed directory structure
Adapted to dir structure changes