Project setup restructuring related to #14