#98 Restructure project