Added GUI and updated file structure