first working manifest & rearranging repos