Fixes and cleanup
Renamed eggs -> files