Some refactoring of directory structure etc.
Same as above comment.