Organizing project: unrelated classes removed