moved some components to base, they are in most cases needed