Major update to classes with a dir structure and RakeFile