Formulae

Moves the formulae back into the main directory.