Major overhaul of program

Fixing poor structure and streamlining filed process