move property pusher component and extension point declarations to correct place