Cache moved to separate class
Changed directory structure