Maintaining multiple projects using same codebase becoming confusing...