Folder rework to prepare usage as submodule