Feature/70684784 jamesv rename dirs

refactored imports and renamed core directory to app