Fix module structure

Change-Id: Ib258f06e7942a41e20a633493c3edb71c1b07aa1