restructure and remove old bootstrapiness