commit 20

refactoring some files