Structural changes to directories

Note that I did not fix how calsses are called so this structural change
will break the entire site until fixes are made.