Functional 2 restructure

I restructured the repo so that I could start functional 2 answers. Feel free to reject this one if you like.