All components refactored and ready