#63 Move class
#63 Fix access specifiers
Move classes
Move classes
Make Substitutions deprecated
Move cache into corresponding package