Removing hard coded directories