Actually create subdirectories for different features
OMG, this was really confusing