Updated SPA modules file names / structure