Refractored project structure