Cleaned some code, moved classes.