Add some descriptions & refactor files structure