Moving back to the regular directory structure.
Move back to the regular directory naming and start deleting some code.