Moved code out of folder nest