Reorganized source directory structure