reorganisation of structure, more separation between bootstrap and solrstrap