Switching to new module structure
Reformatted