Moved files around. Committed CFGs.