Improved structure + added bootstrap.sh