refactor & groovify
Remove unneeded files