Framework finishing touches

renamed main classes