Move to correct dir.
Fixes and refactors.