Add checking for manifest files regex.
Various cleanup.
Remove most of five