Configurable Directories

* Removed redundant functions