Source dir reorganization