moving app infrastructure to main repo