- Cleaned up the complire structure some