More changes.
Moved files and changed config.