Restructure repository