Small fixes for bounds, moving everything into src/