Reorganizing directories. Adding source path resolution.