Shifted major structures into main

Corrected file name, shifted major structure instances into main as
statics to ease referencing issues