Folder re-structure & pref_parent test