More restructuring
Restructuring nearly done

Only need to move GUI desgin to new project