rearrange files moving towards 3.0 refactor