revised resource naming
reorganized and improved
prep for 0.9.5