did some folder rearranging
some more structure rearranging