Refactoring, change name and place
Merge dev
Add emacs.d