Some minor cleanup on filenames
Refactoring and simple tab completion