Improved file-layout + improved logging