Restructurize project