Cleaned up root. Moved classes and arrows to correct components