ignore stuff
merge
restructure directory