Restructure app dir