Fixes #8; retructures project