Added BasicPolicy as superclass to all policies
Fixed naming conventions