Refactored code and added ability to include arbitrary files and folders