Fix issue where files in sub-directories were not being installed, added "grep" wrapper & code clean-up