Clean up
Cleaning up structure and using pods