[UPDATE] Clean up structure
[UPDATE] Clean up structure