Moved parstangular to components and other changes.