initial commit
better namming
removing files
adding comments
resolve conflict