Moved files and projects around so solution is more manageable.