Change project structure to be less confusing - fixed #28