Modify directory struction

Organizing things a little better.