Move studies into separate studies directory

[MatthewGrim]

This issue is a plain and simple re-factor to simplify the directory structure