fix dependecy loading
normalize file structure