Fixed file reference
Removes dead code
Added hardcoded directory structure again because something broke
Fixed