src dir reorganization