beefed up gitignore
refactor into two modules, one parent