finished updated version of main class
removed old files