Consolidated code into one component and module