Fixed a few problems. Added directory search and removed sub directory creation