Relocated some methods in the right classes. Fixed minor issues.