Some file name changes, add options page class and form class