Changed all files. Separated classes.