major refactoring - add directory and change section format