New file structure to avodi name collision
Smarter defaults = less code