Optimized listing of local and remote files
Adjusted package structure, preparations for adding preferences