reorganized
added old stuff, removed useless stuff