Modularising components
Updated readme