Adds Dependencies and Removes Hardcoded Directories