Added support for directory-layout sources
Better logging