Modularizing our components