Restruct

Restructure of the whole program to make it less crap.