Clean the code handling the loading of sub-folders
Add more description on the engineering decisions made on this project