Update

Cleaned up structure, reworked and simplified classes