moved api structure... continuting to clean