fixing author
renamed some, removed old stuff