keeping only common files in master
re-added machine-specific files