Getting rid of GenericStorage, properly attaching macro files