Move files
Fix indentation
Add test runner