First commit post restructure of the folder system