Leveling loading update

The files should be better organized and the loading sequence should be
cleaned up.
Rearrange Files and Update