intermediate commit - module structure done