moving to module format, moved apps to subdirs