Changing files to ".java"

Also deleted some unused commented-out logic