Revert "moved files to parent dir"

This reverts commit a1e764c6f8f0005e2e85dcceee042fbe8f7d58a3.