restructed app dir