Updates to folders and paths; removed unneeded code.