Moved just about every file in the system so dependencies are more obvious.