separate public from non-public resources
remove uneeded code
Merge branch 'master' into restructure-dir
clean up a little
clean up a little
Merge branch 'restructure-dir'