Reorganize interfaces in solution layout