refactoring files + better help screen
refactoring files + better help screen