my stuff
removed needless files
merged changes