Refactored simple shell project