use libtom macros, remove ecrypt directory