moving modules out to root of application