Cleaned Up Structure

Cleanup