Small Updates

Folder restructure & minor fixes. DirPin potentially broken?