Removed dependendency on old folder structure