Simplify installation mechanisms - closes #7