Code Restructured + Components Added