Added some additional Class management

still have problem with creating new file