Added deb repo
Refactored to better use new classes