Move into subdir
Add some comments
Make a package