removed junk, renamed source files