Performed some refactoring/reorganizing of components