Folder structure rewrite and adding two Completion files for the Genesis Framework