removed gay files, merged some dirs