Renamed some files and implemented drawing and trading