Remove src in package names
Fix check of src in package names