Start refactoring and modularizing components