NEW: added some dummy files in folders that should otherwise be empty
FIX: code reorganize