Fixed: Started huge task of separating the components properly.