Move policy files into policy package
Add settings table