Refactor Project directory architecture and naming conventions