rework directories
new AMIs work
Merge pull request #560 from NREL/osserver-cleanup

rework directories