Repo reorganization. Branch 0.3