Moved some components