Restructure, include SVN