Refactored Duncans original project structure