Reorganization

Way better now