Revert "Move into subdirectory"

This reverts commit 72c6e76c80062a7ffcf5f90cde1f2858cd970c72.