Added logging support and restructure file hierarchie