Reorganise Components

Need to better organise the components - some are not in app directory and some are in the base components directory.