refactory
add newlines
some files
merge