(master) added multi-module structure