bug fix
restructure project, resolves #9