Split out utilities
Proper project structure