Minor fixups. Removing src subdirectory