Some refactoring
Moving files