Inputs beautified; Tiny packages refactoring