Improve module, InnerComponent, Behavior features + clean up