clean folders
merge with master