edited component structure and added custom modules