Cleaning and renaming
Restructure to components