Dev/initial3DEngine

Reorganizing the branches, merging the current progress into master.