Move elements to correct component