First pass at install refactoring. #18