Cleaning up aptread folder
Added test-aptload in base dir
Basic refactoring
Refactoring 2