initial commit
some cleaning
cleanup, description and renaming