Restructure application by feature