Reverted back to modules, no infrastructure to build components baked in.