Rearranges folder structure and adds tests project