[Infrastructure]. Moved some items.