Revert "Removed non-used folders in prep for 2014 comp code commit"

This reverts commit 218e59ebc1496c91dec93ef5ce778de2ab56898a.