fixed a few bugs and moved gui files to a folder