Implement some flake8 recommendations
Add 'watch' functionality
Add generic folder for tests