removed console statements
renamed some files