Reorganize things and make the component buildable.