Restructure components