Refactored project inner structure