Moved different classes to different files. Namespaced classes.