Init sources
refactor according to new engine module
minor fixes