Move to src/
Fix bugs