Fix property reference, consolidate custom class into plugin dir