Moved things to conform with new development environment.
fixed errors