removed old class
changed source file format