Fixed directory structure

The directory structure is less ugly this way.