Changed a little on the classes structure.