restructure app dir