Remove extra 'scala' directory from source code paths