refactored file structure a bit