Add folder container for each bundle - composer style
Add some BC for log file path and remove unnecessary code.