restructured app directories