Reorganized source directories and packages