restruct, partly done
mv src to apps