refectoring
remove apt
Merge pull request #6 from dizz/master

Large refactoring