added logic for apps and vehicles; re-organized file hierarchy