Organised Variable Declarations

Moved variable declarations to beginning of main class