Some refactoring
Added moved files