#98 - Restructure project