restructured app files