refactored dir structure to support better docs